Generating correct LIMIT and OFFSET field names #204

dominikbraun · 2019-12-18T11:43:30Z

Fixes #201.

A query like this caused incorrect field names for LIMIT and OFFSET:

-- name: GetFoo :one
SELECT
    (SELECT 1) AS baz
FROM foo
WHERE
	bar = $1
LIMIT $2
OFFSET $3;

The generated struct used to look like this:

type GetFooParams struct {
	Bar   string `json:"bar"`
	Bar_2 string `json:"bar_2"`
	Bar_3 string `json:"bar_3"`
}

This happened because LIMIT and OFFSET are nil for the subquery but they've been assigned to the paramSearch though.

This reverts commit 9007e5e

# Conflicts: # internal/dinosql/parser.go

dominikbraun · 2019-12-18T11:47:35Z

Oops, looks like my previous commits from #178 were in my local history.

dominikbraun added 7 commits December 16, 2019 00:38

returning errors instead of nil

3ccee33

don' allow equal queries and schema paths

9007e5e

Revert "don' allow equal queries and schema paths"

4de79f1

This reverts commit 9007e5e

asking user to open a GitHub issue

623f7d3

removed notes for opening GitHub issues

9b65e22

Merge remote-tracking branch 'upstream/master'

0569ad9

# Conflicts: # internal/dinosql/parser.go

check if LimitCount and LimitOffset exist in query

5fc8437

dominikbraun closed this Dec 19, 2019

dominikbraun deleted the issue/201 branch December 19, 2019 22:11

Provide feedback